513f6b571dd78ce7e77fadf680df6c95934be367,opennms-model/src/main/java/org/opennms/netmgt/dao/jdbc/alarm/AlarmSaveOrUpdate.java,AlarmSaveOrUpdate,persist,#OnmsAlarm#,77

Before Change


    public int persist(OnmsAlarm alarm) {
        Object[] parms = new Object[] {
        		alarm.getUei(), //eventUei
        		alarm.getDistPoller(), //dpName
        		alarm.getNode(), //nodeID
        		alarm.getIpAddr(), //ipaddr
        		alarm.getService(), //serviceID

After Change


    public int persist(OnmsAlarm alarm) {
        Object[] parms = new Object[] {
        		alarm.getUei(), //eventUei
        		(alarm.getDistPoller() == null ? null : alarm.getDistPoller().getName()), //dpName
        		(alarm.getNode() == null ? null : alarm.getNode().getId()), //nodeID
        		alarm.getIpAddr(), //ipaddr
        		(alarm.getService() == null ? null : alarm.getService().getServiceType().getId()), //serviceID